Merge from atest branch.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 27 Mar 2011 08:15:26 +0000 (01:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 27 Mar 2011 08:15:26 +0000 (01:15 -0700)
commit381c1429b4f89bda037c2c5ebad6f41832127613
treead78518fb298aab67a98943cd8ee482ab5dab2bc
parentbd3bdc9cd6f2283b6cadf284cced67d5259f3732
parent2af43a82f3759419ea5692e233382b75ef6e2a71
Merge from atest branch.
src/ChangeLog
src/image.c
src/keyboard.c
src/term.c
src/xterm.c